161c6afe630a98fba8e23d376a5ca53364323473,src/main/java/org/jfrog/bamboo/builder/GradleInitScriptHelper.java,GradleInitScriptHelper,addClientProperties,#ArtifactoryClientConfiguration#ServerConfig#GradleBuildContext#,231

Before Change


        clientConf.resolver.setUsername(globalServerUsername);
        clientConf.resolver.setPassword(globalServerPassword);

        String deployerUsername = serverConfigManager.substituteVariables(buildContext.getDeployerUsername());
        if (StringUtils.isBlank(deployerUsername)) {
            deployerUsername = globalServerUsername;
        }
        String deployerPassword = serverConfigManager.substituteVariables(buildContext.getDeployerPassword());
        if (StringUtils.isBlank(deployerPassword)) {
            deployerPassword = globalServerPassword;
        }

After Change


        clientConf.resolver.setUsername(globalServerUsername);
        clientConf.resolver.setPassword(globalServerPassword);

        String deployerUsername = overrideParam(serverConfigManager.substituteVariables(buildContext.getDeployerUsername())
                , BuildParamsOverrideManager.OVERRIDE_ARTIFACTORY_DEPLOYER_USERNAME);
        if (StringUtils.isBlank(deployerUsername)) {
            deployerUsername = globalServerUsername;
        }
        String deployerPassword = overrideParam(serverConfigManager.substituteVariables(buildContext.getDeployerPassword())
                , BuildParamsOverrideManager.OVERRIDE_ARTIFACTORY_DEPLOYER_PASSWORD);
        if (StringUtils.isBlank(deployerPassword)) {
            deployerPassword = globalServerPassword;
        }